bitkeeper revision 1.1575 (4296fb9akkrLM8bKzQ1I7T3Dy3Uu9w)

Patch ipv4 netfilter code to avoid checksumming CHECKUM_UNNCECESSARY
packets. On Xen the check could fail, as packets from domU have a blank
checksum field.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/.rootkeys b/.rootkeys
index 7c30b7d9a584dca39d9283bba5fb8b64d305fba8..a8825238d665ef82836ba38d3c53284b833bd282 100644 (file)
--- a/.rootkeys
+++ b/.rootkeys
@@ -470,6 +470,7 @@
 427261074Iy1MkbbqIV6zdZDWWx_Jg patches/linux-2.6.11/i386-cpu-hotplug-updated-for-mm.patch
 42372652KCUP-IOH9RN19YQmGhs4aA patches/linux-2.6.11/iomap.patch
 428359d4b3fDYtazwXi4UUmSWaOUew patches/linux-2.6.11/linux-2.6.11.10.patch
+4296fb998LGSWCcljGKbOCUv3h9uRQ patches/linux-2.6.11/net-csum.patch
 424f001e_M1Tnxc52rDrmCLelnDWMQ patches/linux-2.6.11/x86_64-linux.patch
 3f776bd1Hy9rn69ntXBhPReUFw9IEA tools/Makefile
 40e1b09db5mN69Ijj0X_Eol-S7dXiw tools/Rules.mk

diff --git a/patches/linux-2.6.11/net-csum.patch b/patches/linux-2.6.11/net-csum.patch
new file mode 100644 (file)
index 0000000..115cc1e
--- /dev/null
+++ b/patches/linux-2.6.11/net-csum.patch
@@ -0,0 +1,22 @@
+diff -ur linux-2.6.11/net/ipv4/netfilter/ip_conntrack_proto_tcp.c linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
+--- linux-2.6.11/net/ipv4/netfilter/ip_conntrack_proto_tcp.c   2005-05-27 11:47:48 +01:00
++++ linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_tcp.c      2005-05-27 11:48:07 +01:00
+@@ -803,6 +803,7 @@
+        */
+       /* FIXME: Source route IP option packets --RR */
+       if (hooknum == NF_IP_PRE_ROUTING
++          && skb->ip_summed != CHECKSUM_UNNECESSARY
+           && csum_tcpudp_magic(iph->saddr, iph->daddr, tcplen, IPPROTO_TCP,
+                                skb->ip_summed == CHECKSUM_HW ? skb->csum
+                                : skb_checksum(skb, iph->ihl*4, tcplen, 0))) {
+diff -ur linux-2.6.11/net/ipv4/netfilter/ip_conntrack_proto_udp.c linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_udp.c
+--- linux-2.6.11/net/ipv4/netfilter/ip_conntrack_proto_udp.c   2005-05-27 11:47:48 +01:00
++++ linux-2.6.11-csum/net/ipv4/netfilter/ip_conntrack_proto_udp.c      2005-05-27 11:48:07 +01:00
+@@ -120,6 +120,7 @@
+        * and moreover root might send raw packets.
+        * FIXME: Source route IP option packets --RR */
+       if (hooknum == NF_IP_PRE_ROUTING
++          && skb->ip_summed != CHECKSUM_UNNECESSARY
+           && csum_tcpudp_magic(iph->saddr, iph->daddr, udplen, IPPROTO_UDP,
+                                skb->ip_summed == CHECKSUM_HW ? skb->csum
+                                : skb_checksum(skb, iph->ihl*4, udplen, 0))) {